xen pm trace utility cleanup

xenpm trace utility gtraceview cleanup

- add gtraceview help info on how to get raw data by xentrace
- make trace_exit_reason compiled in non-debug mode. trace_exit_reason
  can be enable/disabled by xentrace at runtime, so no need to disable
  it at build time.

Signed-off-by: Yu Ke <ke.yu@intel.com>

diff --git a/tools/misc/gtracestat.c b/tools/misc/gtracestat.c
index fc3bd587d592602558666f743f1e74eccd556bf5..03cc676ffb574cef7b04d9cdc3c5bcec6d28e837 100644 (file)
--- a/tools/misc/gtracestat.c
+++ b/tools/misc/gtracestat.c
@@ -442,7 +442,7 @@ void show_help(void)
 {
     show_version();
     printf("tracestat <trace.data> [-vhdselbcmau]\n");
-    printf("  trace.data       raw data from xentrace\n");
+    printf("  trace.data       raw data got by 'xentrace -e 0x80f000 trace.dat'\n");
     printf("  -v / --version   show version message\n");
     printf("  -h / --help      show this message\n");
     printf("  -d / --digest    digest mode, more variables to specify.\n");

diff --git a/tools/misc/gtraceview.c b/tools/misc/gtraceview.c
index 411a54e9a0c742a6fc5ddda106fc30f9b0e4d6f8..52b7ae2846099304b8f37fd34e6163be63a45d40 100644 (file)
--- a/tools/misc/gtraceview.c
+++ b/tools/misc/gtraceview.c
@@ -542,7 +542,8 @@ void show_help(void)
 {
     show_version();
     printf("gtraceview <trace.data> [--version] [--help]\n");
-    printf("  trace.data   raw data from xentrace\n");
+    printf("  trace.data   raw data got by "
+           "'xentrace -e 0x80f000 trace.dat'\n");
     printf("  --version    show version information\n");
     printf("  --help       show this message\n");
     printf("For more help messages, please press 'h' in the window\n");

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index 6b39a5c1846274541db1ec881604318b8eb936a6..379ca5526fd7ab6a88e22bef67638b9a1bddd50e 100644 (file)
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -198,7 +198,6 @@ static struct {
 
 static inline void trace_exit_reason(u32 *irq_traced)
 {
-#ifdef DEBUG
     if ( unlikely(tb_init_done) )
     {
         int i, curbit;
@@ -215,7 +214,6 @@ static inline void trace_exit_reason(u32 *irq_traced)
             curbit = find_next_bit((const unsigned long *)irr_status, 256, curbit + 1);
         }
     }
-#endif
 }
 
 static void acpi_processor_idle(void)